From 9d4e73849f1de609dc6d717521417ce4e1445a32 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Sun, 27 Jan 2013 03:06:05 +0000 Subject: [PATCH] More groundwork for class-typed time primitives in waypoint. Better types for vecs lookup functions. --- gpsbabel/defs.h | 6 +++++- gpsbabel/vecs.cc | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h index ccf47089e..a57657b42 100644 --- a/gpsbabel/defs.h +++ b/gpsbabel/defs.h @@ -438,7 +438,11 @@ public: url(NULL), url_link_text(NULL), icon_descr(NULL), +#if NEWTIME +// creation_time(QDateTime::fromTime_t(0)), +#else creation_time(0), +#endif microseconds(0), route_priority(0), hdop(0), @@ -891,7 +895,7 @@ void is_fatal(const int condition, const char*, ...) PRINTFLIKE(2, 3); void warning(const char*, ...) PRINTFLIKE(1, 2); void debug_print(int level, const char* fmt, ...) PRINTFLIKE(2,3); -ff_vecs_t* find_vec(char* const, char**); +ff_vecs_t* find_vec(const char*, char**); void assign_option(const char* vecname, arglist_t* ap, const char* val); void disp_vec_options(const char* vecname, arglist_t* ap); void disp_vecs(void); diff --git a/gpsbabel/vecs.cc b/gpsbabel/vecs.cc index c0617e4d5..3ad0b5d69 100644 --- a/gpsbabel/vecs.cc +++ b/gpsbabel/vecs.cc @@ -1122,7 +1122,7 @@ exit_vecs(void) void assign_option(const char *module, arglist_t *ap, const char *val) { - char *c; + const char *c; if (ap->argval == NULL) { fatal("%s: No local variable defined for option \"%s\"!", module, ap->argstring); @@ -1220,7 +1220,7 @@ disp_vec_options(const char *vecname, arglist_t *ap) } ff_vecs_t * -find_vec(char *const vecname, char **opts) +find_vec(const char *const vecname, char **opts) { vecs_t *vec = vec_list; style_vecs_t *svec = style_list; -- 2.30.2